Skip to content

⚠️ Drop unnecessary fields from machine status.nodeRef #12352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

⚠️ Drop unnecessary fields from machine status.nodeRef #12352

wants to merge 3 commits into from
+295 −206

Conversation

fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Jun 13, 2025 •
edited by sbueringer
Loading

What this PR does / why we need it:
Another cleanup to keep our API surface as small as clean as we can

Part of #6539

/area machine

@k8s-ci-robot k8s-ci-robot added area/machine Issues or PRs related to machine lifecycle management cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 13, 2025
@k8s-ci-robot k8s-ci-robot requested review from chrischdi and elmiko June 13, 2025 09:43
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 13, 2025
@fabriziopandini fabriziopandini mentioned this pull request Jun 13, 2025
Open
13 tasks
@sbueringer
Copy link
Member

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-33-1-34-main

sbueringer
sbueringer reviewed Jun 16, 2025
View reviewed changes
api/core/v1beta2/machine_types.go Outdated
@@ -556,6 +556,15 @@ type MachineStatus struct {
Deprecated *MachineDeprecatedStatus `json:"deprecated,omitempty"`
}

// MachineNodeReference is a reference to a the node running on the machine.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// MachineNodeReference is a reference to a the node running on the machine.
// MachineNodeReference is a reference to the node running on the machine.

docs/book/src/developer/providers/migrations/v1.10-to-v1.11.md Outdated
@@ -199,6 +200,8 @@ proposal because most of the changes described below are a consequence of the wo
- Support for terminal errors has been dropped.
- `status.failureReason` and `status.failureMessage` will continue to exist temporarily under `status.deprecated.v1beta1`.
- The const values for `Failed` phase has been deprecated in the enum type for `status.phase` (controllers are not setting this value anymore)
- The type of the `status.nodeRef` field has been changed from `corev1.ObjectReference` to `MachineNodeReference`.
- The following fields has been removed from `status.nodeRef`: `kind`, `namespace`, `uid`, `apiVersion`, `resourceVersion`, `fieldPath`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- The following fields has been removed from `status.nodeRef`: `kind`, `namespace`, `uid`, `apiVersion`, `resourceVersion`, `fieldPath`
- The following fields have been removed from `status.nodeRef`: `kind`, `namespace`, `uid`, `apiVersion`, `resourceVersion`, `fieldPath`

internal/controllers/cluster/cluster_controller_test.go Outdated
Kind: "Node",
Namespace: "test-node",
},
NodeRef: &clusterv1.MachineNodeReference{},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add Name: "test-node". I think that was the intention of the old code

(same above in the other case)

test/framework/deployment_helpers_test.go
@@ -68,7 +68,7 @@ controller_runtime_reconcile_panics_total{controller="clusterclass"} 0
# TYPE controller_runtime_webhook_panics_total counter
controller_runtime_webhook_panics_total 0
`),
wantErr: "panic occurred in \"cluster\" controller",
wantErr: "1 panics occurred in \"cluster\" controller (check logs for more details)",
Copy link
Member

@sbueringer sbueringer Jun 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these tests not executed in CI?
(If yes, let's please fix that or open a help wanted issue for it. Doesn't have to be part of this PR of course)

They were not green before this change, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#12364

@sbueringer
Copy link
Member

/assign @JoelSpeed
PTAL :) (reviewing only the API change would be enough)

JoelSpeed
JoelSpeed reviewed Jun 16, 2025
View reviewed changes
api/core/v1beta2/machine_types.go
// +required
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=253
Name string `json:"name"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Names are DNS1123 subdomain validated.

Lets borrow this comment

@fabriziopandini fabriziopandini mentioned this pull request Jun 16, 2025
Open
@fabriziopandini fabriziopandini added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jun 16, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from joelspeed. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@fabriziopandini fabriziopandini force-pushed the refactor-machine-nodeRef branch from a6cb3be to 2c68862 Compare June 16, 2025 14:35
@fabriziopandini
Copy link
Member Author

/hold
To finalize validation and comments on #12358

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 16, 2025
@k8s-ci-robot
Copy link
Contributor

@fabriziopandini: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-test-main 2bcb662 link true /test pull-cluster-api-test-main

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@elmiko elmiko Awaiting requested review from elmiko

Assignees

@JoelSpeed JoelSpeed

Labels
area/machine Issues or PRs related to machine lifecycle management cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fabriziopandini @sbueringer @k8s-ci-robot @JoelSpeed